Autogenerated HTML docs for v1.5.3.5-474-g3e4bb
diff --git a/git-mergetool.html b/git-mergetool.html index 80706db..d2a24b8 100644 --- a/git-mergetool.html +++ b/git-mergetool.html
@@ -293,12 +293,17 @@ <p> Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff </p> <p>If a merge resolution program is not specified, <em>git mergetool</em> will use the configuration variable merge.tool. If the configuration variable merge.tool is not set, <em>git mergetool</em> will pick a suitable default.</p> +<p>You can explicitly provide a full path to the tool by setting the +configuration variable mergetool.<tool>.path. For example, you +can configure the absolute path to kdiff3 by setting +mergetool.kdiff3.path. Otherwise, <em>git mergetool</em> assumes the tool +is available in PATH.</p> </dd> </dl> </div> @@ -316,7 +321,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jul-2007 02:09:46 UTC +Last updated 02-Nov-2007 02:47:21 UTC </div> </div> </body>
